From 8a93d3beb00d925ad5a4ddb8123c2a6936f9df41 Mon Sep 17 00:00:00 2001 From: "mjw@wray-m-3.hpl.hp.com" Date: Fri, 9 Jul 2004 12:53:22 +0000 Subject: [PATCH] bitkeeper revision 1.1058 (40ee95423ht4Gq0VKvBW7yu6DP8hZA) Pass domain name down to vifctl to avoid recursion. --- tools/python/xen/xend/XendDomainInfo.py | 2 +- tools/python/xen/xend/server/netif.py | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 89b23054ce..fd1cfd9aad 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -780,7 +780,7 @@ def vm_dev_vif(vm, val, index): defer = xend.netif_dev_create(vm.dom, vif, val, recreate=vm.recreate) def fn(id): dev = xend.netif_dev(vm.dom, vif) - dev.vifctl('up') + dev.vifctl('up', vmname=vm.name) vm.add_device('vif', dev) print 'vm_dev_vif> created', dev return id diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index 4d3b854bed..894dc85832 100755 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -161,12 +161,9 @@ class NetDev(controller.Dev): """ return ':'.join(map(lambda x: "%x" % x, self.mac)) - def vifctl_params(self): - from xen.xend import XendDomain - xd = XendDomain.instance() + def vifctl_params(self, vmname=None): dom = self.controller.dom - dominfo = xd.domain_get(dom) - name = (dominfo and dominfo.name) or ('DOM%d' % dom) + name = vmname or ('DOM%d' % dom) return { 'domain': name, 'vif' : self.get_vifname(), 'mac' : self.get_mac(), @@ -174,10 +171,10 @@ class NetDev(controller.Dev): 'script': self.script, 'ipaddr': self.ipaddr, } - def vifctl(self, op): + def vifctl(self, op, vmname=None): """Bring the device up or down. """ - Vifctl.vifctl(op, **self.vifctl_params()) + Vifctl.vifctl(op, **self.vifctl_params(vmname=vmname)) def destroy(self): """Destroy the device's resources and disconnect from the back-end @@ -186,7 +183,6 @@ class NetDev(controller.Dev): def cb_destroy(val): self.controller.send_be_destroy(self.vif) self.vifctl('down') - #d = self.controller.factory.addDeferred() d = defer.Deferred() d.addCallback(cb_destroy) self.controller.send_be_disconnect(self.vif, response=d) @@ -272,7 +268,6 @@ class NetifController(controller.Controller): def reattach_devices(self): """Reattach all devices when the back-end control domain has changed. """ - #d = self.factory.addDeferred() self.send_be_create(vif) self.attach_fe_devices() -- 2.30.2